From f00713a392de74c01d4dce27b4219446044b6c59 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 26 Apr 2007 15:25:09 +0100 Subject: [PATCH] acm: Fix 32-bit build with acm enabled. Signed-off-by: Stefan Berger --- xen/acm/acm_policy.c | 8 ++++---- xen/include/acm/acm_core.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/acm/acm_policy.c b/xen/acm/acm_policy.c index e0c0ba21a1..033057b40a 100644 --- a/xen/acm/acm_policy.c +++ b/xen/acm/acm_policy.c @@ -46,7 +46,7 @@ static ssidref_t oldssid_to_newssid(const struct acm_ssid_domain *, int -acm_set_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size) +acm_set_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size) { u8 *policy_buffer = NULL; int ret = -EFAULT; @@ -213,7 +213,7 @@ do_acm_set_policy(void *buf, u32 buf_size, int is_bootpolicy, } int -acm_get_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size) +acm_get_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size) { u8 *policy_buffer; int ret; @@ -278,7 +278,7 @@ acm_get_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size) } int -acm_dump_statistics(XEN_GUEST_HANDLE(void) buf, u16 buf_size) +acm_dump_statistics(XEN_GUEST_HANDLE_64(void) buf, u16 buf_size) { /* send stats to user space */ u8 *stats_buffer; @@ -324,7 +324,7 @@ acm_dump_statistics(XEN_GUEST_HANDLE(void) buf, u16 buf_size) int -acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE(void) buf, u16 buf_size) +acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE_64(void) buf, u16 buf_size) { /* send stats to user space */ u8 *ssid_buffer; diff --git a/xen/include/acm/acm_core.h b/xen/include/acm/acm_core.h index b3952c9592..bb650e3da2 100644 --- a/xen/include/acm/acm_core.h +++ b/xen/include/acm/acm_core.h @@ -155,13 +155,13 @@ int acm_init_domain_ssid(domid_t id, ssidref_t ssidref); int acm_init_domain_ssid_new(struct domain *, ssidref_t ssidref); void acm_free_domain_ssid(struct acm_ssid_domain *ssid); int acm_init_binary_policy(u32 policy_code); -int acm_set_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size); +int acm_set_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size); int do_acm_set_policy(void *buf, u32 buf_size, int is_bootpolicy, struct acm_sized_buffer *, struct acm_sized_buffer *, struct acm_sized_buffer *); -int acm_get_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size); -int acm_dump_statistics(XEN_GUEST_HANDLE(void) buf, u16 buf_size); -int acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE(void) buf, u16 buf_size); +int acm_get_policy(XEN_GUEST_HANDLE_64(void) buf, u32 buf_size); +int acm_dump_statistics(XEN_GUEST_HANDLE_64(void) buf, u16 buf_size); +int acm_get_ssid(ssidref_t ssidref, XEN_GUEST_HANDLE_64(void) buf, u16 buf_size); int acm_get_decision(ssidref_t ssidref1, ssidref_t ssidref2, u32 hook); int acm_set_policy_reference(u8 * buf, u32 buf_size); int acm_dump_policy_reference(u8 *buf, u32 buf_size); -- 2.30.2